Merge pull request #6 from szabgab/main

foo
solved issue #34
Merge pull request #35 from EitanSchuler/master

issue 34