Merge pull request #1 from emahags/master

Various fixes