Merge pull request #1 from NicozRobin/master

pull request1
Revert "pull request1"
Merge pull request #2 from NicozRobin/revert-1-master

Revert "pull request1"
Merge pull request #3 from NicozRobin/dev

Dev