commit!!

Titel
Merge remote-tracking branch 'origin/master' into SmallChanges
Merge pull request #57 from SW2A305/SmallChanges

Small changes
Merge branch 'master' into SQLite_Implementation_Test