Merge pull request #27 from QtheEskimo/master

Master