Merge pull request #2 from yawenc/master

Some minor additions but site is down and I can't fake test stuff
Testing