java8.
Merge pull request #432 from square/dimitris/ps

java8.