marek's comments
Merge pull request #12 from joesavak/master

marek's comments