Merge pull request #124 from Vexatos/master