Merge pull request #9 from mstraka/master

Fixes in SE