Merge pull request #508 from dibdot/master