Closes #78
Merge pull request #79 from STIXProject/issue_78

Closes #78