some mods
Merge pull request #1 from waisbrot/some-pull-request

some mods