Merge pull request #16 from gabi2/master

version and changelog