implements Issue #2

* add feature and fix for #2
* implements #2