Fix issue #105
Merge pull request #156 from ArcBees/jd_105

Fix issue #105