Experimenting with auto-merging after build success on dev-master.
Merge pull request #33 from rhyolight/dev-master

Experimenting with auto-merging after build success on dev-master.