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

changelog and version