Merge pull request #2 from philipschwarz/master

add intellij IDEA project file
Merge pull request #3 from philipschwarz/refactor-attempt-1

Merge pull request #2 from philipschwarz/master