Merge branch 'master' into nehad
all backend methods added
fixed merge conflicts