Merge branch 'release/0.2.4' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Bump release to 0.3

* Add dockerfile
Merge branch 'release/0.3'