Assorted fixes
Merge pull request #15 from kaeza/master

Assorted Fixes