Merge pull request #3 from maxsnew/master

Fix more documentation.
Fix some compile errors