Merge pull request #26 from symphonists/integration

Version 2.1.1
Merge pull request #31 from symphonists/integration

Version 2.1.2
Adjust HTML for namespaces, fixes duplicator error
Fix deprecated function name