FIX: Multiple fixes
FIX: Minor fix
Merge pull request #39 from Eric89GXL/fixes

FIX: Multiple fixes