Issue #197
Merge pull request #198 from lordnox/master

Issue #197