add documentation and better printing
update makefile and minor doc change
fix some warning
some change need to be reverted
some change need to be reverted
change reverted
Merge branch 'master' into HEAD

Conflicts:
	data.c