begin 0.3-SNAPSHOT
Merge branch 'develop'
fixed bad merge on master