Merged development branch with master for version 0.2