Fixes & minor additions
Merge pull request #13 from Ishap/master

Fixes & minor additions