FIX #315
Merge pull request #316 from ecomfe/issue-315

FIX #315