added all the changes
Merge pull request #2 from topcoat/npm-mixin

added all the changes