implement activity creation
minor fix
minor fix
Merge remote-tracking branch 'origin/master'