hoveeman Merge pull request #2 from wenweil/master …