Merge pull request #397 from way2muchnoise/1.7-update

adds use of @Optional annotation to CC turtles