more changes
Merge pull request #5 from AkermanGreg/greg

more changes