resolved #2   had to rename some cell methods to setCell to prevent ambiguous calls
Merge remote-tracking branch 'origin/master'