cleaned up
Merge branch 'master' of https://github.com/andreiantonescu/modulab-2014