Merge pull request #23 from rangerofthewest/master

Merging Pull Requests
Merge pull request #25 from rangerofthewest/rangerofthewest

Merge pull request #23 from rangerofthewest/master