[#41] pull request from master