tests passing now
tests passing now
Merge pull request #20 from NHQ/merger

tests passing now