added Update capability.  Added support for insert or update.
Merge origin/master