Merge branch 'release/0.1'

Test to see if this works with Openshift
testing
Merge remote-tracking branch 'upstream/master' into develop