Changed base layer to filippovitale/java7