Dmasad.ticket51.gridfix

Fix issue #51 and make Grid inheritance much cleaner..