Merge pull request #2 from jaguillette/master

Sync from original