Fixes issue #76
Merge pull request #77 from amsayk/origin/fix_for_76

Fixes issue #76