Merge pull request #2 from danijeljames/master

v1.0.1