Merge pull request #60 from Hasimir/master

init main stuff