add remove function or validate
Merge branch 'master' of https://github.com/PicNet/picnet_closure_repo