Finish Release-1.2.0
Merge pull request #3 from PizzAna/master

Master
Changes done
Finish Release-1.2.1