minor fixes
Merge branch 'gimmenode' of github.com:jodaka/marlin into gimmenode