Merge pull request #17 from draganglumac/master

Merged Alex's changes and generated new man pages.
fixed broken tail
fixed broken tail