Work on Issue #15. Everything tested. We should test if inner classes are handled properly.