some changes
Merge pull request #4 from sandstroh/sandrosbranch

some changes