trying to fix a mistake of mine
Merge branch 'master' of https://github.com/DanielBelsky/612-2014