Add javadoc and setLocation(Location)
Merge remote-tracking branch 'origin/master'