hotfixes
Merge pull request #7 from iBencon/hotfixes

hotfixes