issue22
Merge branch 'master' into issue22