Fix for bug report #137
Merge branch 'dev' into ms