Tests and Fixes #149
Merge pull request #150 from TAXIIProject/issue_149

Tests and Fixes #149