Develop

minor changes. merge then create a develop branch.