lowering memory startup values to make it run on a small VM
merging develop into master