Merge pull request #11 from ordrin/master

Git history messup cleaning
Attempt to bring back lost file into npm
Merge pull request #12 from ordrin/dev_polina

Dev polina