BUG#5

* fixed BUG#5
* fixed tests
* draft for BUG#1