Resolves #259
Merge pull request #262 from WebtehHR/fix_259

Resolves #259