Merge pull request #1 from ricecake/master

Merge pull request #1 from shaneutt/master
Merge pull request #2 from shaneutt/master

Merge pull request #1 from ricecake/master