fix #118
doc update
Merge pull request #120 from sbillard/master

08242014