Cleanup
Cleanup
Resolve merge conflict with localhost.p12
Merge pull request #151 from ozone-development/release-0.3.1

Release 0.3.1
Merge pull request #152 from ozone-development/master

Master