Merge pull request #74 from cassandra-project/develop

get updates
resolves #325

New pricing scheme: Maximum power demand pricing
Merge pull request #329 from fgiannar/develop

resolves #325