Merge pull request #493 from HoboDaveGoBOOM/master

CSM Rapier update