initial revisions
merge nquinlan/master