Merge pull request #33 from fernandoacorreia/master

Merge commits from fernandoacorreia