Merge remote-tracking branch 'experimental/adhoc'

Trimmed unrelated code.

Conflicts:
	.gitignore
	LICENSE
	README.md
modularized
fixed build