Merge pull request #9 from hashr25/master

Sync
Merge pull request #12 from hashr25/Chris

Merge pull request #9 from hashr25/master