Merge pull request #455 from azuk/master