update from mac
update from mac 2
Merge branch 'master' of http://github.com/jimlavrenz/clib
more