Updated to luna + java 8