merge update from djrbliss:master