Fixed issues 611 and 622.
Added name to credits
Merge pull request #733 from kpatnode/master

Quick fixes