Adam changes

stuff
Merge pull request #9 from Orasi/adam_branch

Adam changes