Fixed some naming and namespace issues.
Updated README with more examples
Merged master fixed conflict.
Updated package script
Merge remote-tracking branch 'origin/devel'