Fixing some issues mentioned in codeplex issues I closed
Merge pull request #125 from JakeGinnivan/SmallFixesFromCodeplexIssues

Fixing some issues mentioned in codeplex issues I closed