Merge pull request #175 from sigmavirus24/master