Merge pull request #309 from wongoo/master