Merge pull request #324 from fgiannar/develop

updates #316, #320
Fixes in lighting schema (Issue #119)
Merge pull request #73 from cassandra-project/develop

get updates