Merge pull request #2 from argoroots/dev

Dev -> Master
Tundub, et mihkel sai miskit jälle vilkuma :)
Merge branch 'dev'
Merge branch 'master' into dev