karl's initial commit
Merge pull request #19 from kgentner/newbranch

karl's initial commit