Fix docs; Fix code.
Merge pull request #102 from pretenders/hot_fix

Hot fix