fcampelo Merge pull request #37 from brunasqz/proposed-fixes