Fix #5 and #6
Merge pull request #9 from dxenakis/intial-tasks

Fix #5 and #6