guilherme #25

Closed
awade wants to merge 3 commits from guilherme into dev