code changes
Merge pull request #17 from rmagrare7/master

added many things