merging serf work into master