Merge pull request #30 from rangerofthewest/master

Merge with master