Merge pull request #201 from eVoLuTiVeMEDIA/master

Added grid references, some fixes. Code simplification and comments