Merge pull request #1 from jphalip/master

Merged with jphalip's latest (but old) release