Slight refactoring
Merge branch 'master' of https://github.com/SBLLB/Challenge3_FAAST