More documentation
merge math fix
Merge pull request #15 from nbr2/master

merge math fix