Fixing issues
Merge pull request #73 from InCNTRE/fix

Fixing issues