Changed author name in Constants.java
Merge origin/master