Changed underscores in filenames to hyphens. Fixed some 'fnd' issues.
Merge branch 'master' of https://github.com/bergoid/rabot