Merge pull request #11 from andrewdex/master

Latest Merge