Merge pull request #48 from rhyolight/dev-master

Merging recent changes to master into dev-master
Merge dev-master into master