committing weekend updates
Merge pull request #5 from yawenc/master

committing weekend updates