michaelklishin Merge pull request #17 from phonohawk/master …