#25 UnitedThrow added
#25 fixes after review
Merge pull request #28 from krzyk/25

#28: pull request #25 UnitedThrow added