adding better documentation and example
resolving conflicts