Issue 77

Part 2
80CAHandler repait
Missing file
Merge pull request #203 from CynicRus/master

Issue 77