Issue 7
Merge pull request #16 from kristitausk/master

Issue 7