andreikop Merge pull request #94 from abitrolly/master