Development

merging my development with master branch.