commit of work I've done so far
Merge branch 'release/0.0.0.1' into develop