new changes
Merge branch 'fix001'

Conflicts:
	sample.cpp