Prepared for release 0.5