stage 3 finalized by us
Merge branch 'master' of http://github.com/xosnitc/xosnitc.github.com