Merge pull request #94 from chrqls/dev

[#92/93] Fixing issue 92 and maybe 93