Remove name collision in 2.x
Add documentation.
Merge pull request #3 from dereuromark/master

Merge master