issue #287
Merge branch 'issue287' into dev