Issue #31 done. Now an automatic surrounding class can be created.