Refactoring to make it testable
Vendor prefixes updated
Merge pull request #2 from pukhalski/master

merge pull request #200 from larchanka/master