Merge pull request #299 from tyszja/master