added an bug fix
Merge branch 'master' of github.com:pgustafs/test into r2_newfeature
added some more text