Update master branch with latest devs from unstable branch #34

Open
pcaseiro wants to merge 67 commits from unstable into master

Diff Content Not Available