merged latest from Tony

@tonytomov : thanks!