Adding test and cleaning up formatting
Merge pull request #114 from wpreul/master

Adding test and cleaning up formatting