Fixed #386
Merge pull request #387 from tomangelo2/dev

Fixed #386