Merge pull request #528 from TeruU/master

 Changes to be committed: