Merge pull request #126 from chriscz/master