Merge pull request #12 from ryancrawcour/master

merging changes from giventocode
Merge remote-tracking branch 'upstream/master'