Merge pull request #500 from bslenul/master