Merge pull request #158 from duncannz/master