Fixed issue #19 Move code to custom cell class