Merge pull request #10 from devinmatte/master

Master