CHANGELOG:
fix #12
fix #10