After Steve's refactoring
Merge branch 'master' of https://github.com/yvettecook/FAAST