version 0.0-1 ready for testing
version 0.0-2 ready for testing
Merge branch 'master' into develop