tests finished
Merge pull request #27 from dalexj/adam-branch

tests finished