flush
merge
complete update function
complete update function
Merge pull request #17 from callofdutyops/master

complete update function