Merge pull request #167 from madeddie/master