Fixes #197
Fixes #211
Merge pull request #217 from aesedepece/fix-for-issue-197

Fixes #197
Merge pull request #218 from aesedepece/fix-for-issue-211

Fixes #211
Merge pull request #220 from loqui/master

Update dev branch