Print statements added
Merge conflict resolved
Merge branch 'benchmarks' of https://github.com/materialsproject/fireworks into benchmarks
In the bugfix mode
In the bugfix mode
Bug fixed