Merge pull request #33 from richierichrawr/master