Merge pull request #6 from ZorGleH/master

Tests ok, Travis-CI enabled, grunted, README markdown