Various Fixes
Merge pull request #5 from ybilta/master

Various Fixes