Merge pull request #1 from cvs79/Dev

Dev