Changed Exception to StandardError, as per #183.
Merge pull request #194 from yvds/staging

Changed Exception to StandardError, as per #183.