Some improvements in design.
Some minor improvements.
Merge pull request #3 from VEINHORN/develop