Merge pull request #5 from armmimic/Lukasz

Last one was wrong way. This is the correct one.