Merge branch 'master' into fixing
added comments
fixed indent
fixed this casting around thing...
fixed doxygen as it contained the old library name
Merge branch 'fixing'