renamed some functions,
Merge branch 'master' of ssh://github.com/ollerac/Journeyship