Fixes
Merge branch 'master' of https://github.com/kveskimae/tw-challenge-2014