some minor fixes
Merge pull request #1 from jeserkin/master

some minor fixes