Fixed path to file to be sourced
Fixed minor issues discovered during testing.
Merge pull request #83 from nwinklareth/master

Fixes as a result of testing