Merge pull request #232 from dibdot/master