Issue #24

* Tests are not done
* Issue not ready