Merge pull request #1 from limbenjamin/master

some updates from ben
Merge pull request #3 from yzixuan/master

tryout