ver. 0.9.3, cleanup
ver. 0.9.3, cleanup
ver. 0.9.4, debug flag disabled