Some fixes
merged branch andreia/fix-01 (PR #57)

This PR was merged into the master branch.

Discussion
----------

Some fixes

Commits
-------

6aa92af Some fixes