Merge pull request #8 from andrewdex/master

Latest Merger