Fixes for SE
Fixes for SE
Merge pull request #9 from mstraka/master

Fixes in SE