Merge pull request #31 from cassandra-project/develop

Develop
close #4 close #154

Beautification and Monte Carlo runs closed
Merge pull request #155 from fgiannar/develop

Develop