Merge pull request #102 from ooeygui/develop

Merge Dmap (lightning) into develop