further progress
Merge branch 'master' of https://github.com/shadowpt/IWantToBeWeak_0.2