Adding changes so that it turns correctly when given the command
Merge branch 'master' of github.com:araju/maslab-2014