Implementing both feature #81 and #61

Implemented #81 and #61 
Good catched! That sentence in the documentation was wrong.

Fixed in 00a8da4.