more tweaks
Merge pull request #29 from noelmiciano/master

more tweaks