Merge branch 'master' into iss50

Test