Merge pull request #309 from azuwis/master