changed inheritance behavior
Merge branch 'master' of https://github.com/ubegun/Cybercat.git