simplifying things
Merge pull request #69 from dildick/master

simplifying things