Update Main.java
Merge branch 'master' into develop