Partial fix for issue#1
Merge commit 'b1363248d0c28e33d8974c6e50c5eede665946f9'