Merge pull request #428 from ac3522/master