Added inner classes
Merge branch 'master' of https://github.com/larseen/KTN-ELM-CHAT