bryceg Merge pull request #28 from Tarmil/master