Revamp
Merge branch 'master' of https://github.com/rtymchyk/rtymchyk.github.com