a lot of changes!
some renamings because of camelcase problems
camelcase stuff
some fixes
Merge pull request #1 from pfefferle/master

complete refactoring