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

version and changelog