Merge pull request #181 from its-pointless/master