minor changes
Merge branch 'master' of http://github.com/Daiver/jff
minor changes