Push merge to github
Updated documentation