Fixed dangling ifdef, updated makefile etc
Merge branch 'master' of https://github.com/rbellido/Project