Merge pull request #385 from NSAKEY/master