updated to reflect the concept int *-backend
Merge branch 'master' into gh-pages