Adding more documentation hints
Merge branch 'master' into dev
Updating changes
Fixing buggy implementation
Modified changes
0.117