Version 0.3.0
Merge branch 'update' into update.macosx
Merge branch 'travis.macosx' into update.macosx