Merge pull request #3 from yawenc/master

Moving some items around
committing weekend updates
Merge remote-tracking branch 'remotes/upstream/master'