[*] Merged PR #3 from @marcinsz101