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

version and changelog