Merge pull request #60 from JoshuaEstes/master

Refactoring and bug fix
Merge pull request #61 from JoshuaEstes/master

removed coveralls from build