Merge pull request #21 from shaneob/master

Merge pull request #20 from shaneob/shane