Issue168 fixed.
Merge branch 'Issue168' into Development