Merge pull request #10 from adam6806/master

Merge pull request #9 from adam6806/Adam
Merge pull request #11 from adam6806/Adam

Merge pull request #10 from adam6806/master