cleaned up master branch to have all changes