Merge pull request #403 from jslachta/master