Oops - a Java 7ism crept in
Merge pull request #40 from Randgalt/master

Update