v.1.0.34, consolidating last 3 commits (ran ./makefile)