Merge pull request #1 from roguephysicist/master

bemese/master merged, first draft complete