Merge pull request #332 from tripzero/master