bug fixes
Merge branch 'bug_fix_1.0'

Conflicts:
	lib/test.h