Adds some stuff
Merge pull request #5 from ktaras/dev

Adds some stuff