More updates
Merge branch 'master' of git://github.com/terah/fluent-model