Merge pull request #5 from zelzel2315/master

pull
Merge pull request #6 from zelzel2315/Cris2Branch

Merge pull request #5 from zelzel2315/master