Fix
Merge pull request #189 from rmcgibbo/fix

Fix for PR #149