Merge pull request #498 from Unroll-Me/master