#194 fixes
Merge pull request #197 from aybarscengaver/master

#194 fixes