jens first commit
Merge pull request #1 from Gloryofthe80s/jen_branch

jens first commit
pushing before attempting to merge with latest master