merge the changes from dev to master

first pull request.