code improvements, code beautification, more and better comments
Merge pull request #231 from panique/develop

code improvements, code beautification, more and better comments