fixed issue #9
fixed issue #9 + doc and spec patch