Merge pull request #18 from aproctor/master

Sync