Merge pull request #11 from longjon/master