Improved class.
Some fixes.
Merge branch 'master' of github.com:roboime/ip-jan-bramigk