Merge pull request #2 from cvs79/Dev

Dev