Bug Fix Issue #13
Issue 12, 13, 14
Merge branch 'master' of https://github.com/ScottColson/SparkleXrm