Fixed bug #250
Merge branch 'qa' into 3scape-simple