Merge pull request #303 from pgreyson/master

add/delete flow implemented