fixed issue #4
updated changelog
Merge branch 'issue#4'
fixed changelog