add to master. merged code from other project