stage 4 in progress again
Merge branch 'master' of https://github.com/xosnitc/xosnitc.github.com