Updated comments and example
Merge branch 'working'

Updated comments and example.cpp