Merge pull request #363 from chalet16/master