test commit from IntelliJ
Merge pull request #4 from eghm/master

test commit from IntelliJ