some various changes
a lot of changes
Merge pull request #9 from pfefferle/master

a lot of changes