Closes #70.
Updated to maybe make a better fix
Merge pull request #74 from TAXIIProject/issue_70

Issue 70