Merge pull request #15 from joelpickup/master