some more changes

here
Merge pull request #2 from jgab3103/newbranc

some more changes