Updated style
Merge branch 'master' of https://github.com/dgund/Felix
Merging updated style