Remove spaces and did some tests
Merge branch 'master' of https://github.com/anpar/oz-project-fsa12