Merge pull request #55 from JoshuaEstes/master

Continuous Integration
Merge remote-tracking branch 'upstream/master'

* upstream/master: