mgastner Merge pull request #22 from johnyrufus/master