Fix
Merge pull request #96 from isflorin/dev

Fix
Merge pull request #97 from isflorin/test

Test