Merge pull request #16 from pyr/master