Merge pull request #220 from loqui/master

Update dev branch
Merge remote-tracking branch 'upstream/master'
Fix for issue #225
Merge pull request #226 from aesedepece/fix-for-issue-225

Fix for issue 225