Increased number of default steps
Made Makefile more robust
Merge branch 'feature/energy'