Development branch to master

Merge changes for version 0.2.4