Contributor branch

pull changes into contributor