Merge pull request #1 from chrisfinazzo/master

Sync