Merge pull request #48 from rhyolight/dev-master

Merging recent changes to master into dev-master
Adding tests to travis.
Merge remote-tracking branch 'upstream/dev-master' into dev-master