Keep master
up-to-date with latest documentation
#101
Merged
master
up-to-date with latest documentation
#101