Fixed #323 partially completed merge.
Merge pull request #335 from denisrosset/topic/fix-PR-323

Fixed #323 partially completed merge.