version and changelog
Merge pull request #22 from gabi2/master

version and changelog