Merge pull request #8 from adam6806/master

sync
Merge pull request #9 from adam6806/Adam

Merge pull request #8 from adam6806/master