Merged callme demo changes from master