Bugfixes
Merge pull request #62 from AndreG-P/master

Bugfixes