More fixes
Merge pull request #4 from swgopenge/master

More fixes