Compatible build with IntelliJ IDEA
Merge pull request #42 from janm399/master

Compatible build with IntelliJ IDEA
Merge remote-tracking branch 'upstream/master'