simple hotfixes, fixing bugs
Merge pull request #2 from tinaun/hotfix

simple hotfixes, fixing bugs