Merge pull request #23 from rangerofthewest/master

Merging Pull Requests