[FIX] Issue 259
Merge pull request #262 from skler/issue-259-2

[FIX] Issue 259