making this guy a better citizen. fixes #26 #38