address #158 #159
address #160
Merge pull request #161 from STIXProject/exercise_mods

Exercise mods