Merge pull request #15 from Karnith/master

update dev
version bump
refactor tasks
Merge pull request #16 from Karnith/dev

Dev