Merge pull request #70 from tomasz-kuzemko/dev

OK