done with all the tasks for this week, horrray
Merge branch 'master' of https://github.com/btsmarco/tc349