[x] fixed issue #24
[x] checked issue #25