Merge devel to master for release 0.02