Merge pull request #21 from shaneob/master

Merge pull request #20 from shaneob/shane
Merge pull request #22 from shaneob/shane-new

Merge pull request #21 from shaneob/master