Fix "except"
Merge pull request #82 from kirov/patch-1

Fix "except"