Removed old functions.
Special line for help.
Code cleanup.
Merge branch 'master' into devel