added an bug fix
Merge branch 'master' into r2_test
Added some more text