Master

pull devel to master for release 0.8