memoization
docs update
Merge branch 'master' into 0.1.3
doc update