fold work
Merge branch 'master' of git://github.com/HigherState/jameson