Merge pull request #8 from ptone/master