patrickarlt Merge pull request #350 from patrickarlt/master