Merge pull request #38 from adam6806/master

sync for deletion
Merge pull request #39 from adam6806/Dylan

Merge pull request #38 from adam6806/master