First three tasks completed
Minor fixes
Merge pull request #1 from matijaderk/master

First three tasks