Stuff
Merge branch 'master' of https://github.com/anidev/612-2013
Merge branch 'master' of https://github.com/anidev/612-2013
important to prevent crash
Merge branch 'master' of github.com:anidev/612-2013