Fix #4 and is almost an middle step to #8
Merge pull request #16 from luizfilipe/someDevs

Fix #4 and is almost an middle step to #8