Fix
Merge pull request #98 from isflorin/dev

Fix
Merge pull request #99 from isflorin/test

Test