Merged with origin/development (release 0.3.6) and handled bug #303.