version changed
Merge pull request #222 from krzysiekbarca/master

devel to master
Updated version
Merge pull request #223 from szprutamich/devel

Master to devel