Merge pull request #384 from NSAKEY/master