Update. closes ticket #1