Various improvments/fixes
Merge pull request #34 from mistercrunch/fixes

Various improvments/fixes