Fixing
Merge branch 'master' of https://github.com/thedoers/2013thedoers