description updated.
code improvements.
Merge pull request #4 from gneutzling/refactoring

Refactoring
bug fixes and code improvements.