Resolve Issue#47
Merge pull request #70 from wszib-kolo/Issue#47

Resolve Issue#47