complete description of functions and cleanup
Merge pull request #405 from gergo85/patch-23

Complete description of functions and cleanup