Merge pull request #10 from slang800/master

various changes (mostly docs & formatting)
adding marc