mareksuscak Merge pull request #12 from lesf0/master