Merge pull request #2 from fdeberle/master

Integration of Gregor's test setup
ignore .idea