a bit of clean up
Merge branch 'master' into merge_attempt

Conflicts:
	examples/read.cpp
	examples/write.cpp
macos X initialization script
Merge pull request #12 from cbernet/few_easy_mods

Few easy mods