CHANGELOG:
fixed #16;
fixed #12;