Fix bugs

* it closes #21
* it closes #15