Merge pull request #9 from aproctor/master

Sync up with master