Freelancer:
jhosser
some corrections
some corrections