Merge pull request #26 from laughingwithu/master

new providers and clean up of inserthtml function
Cleaned up last pull request
Merge pull request #5 from felixgirault/master

update to match