Merge pull request #115 from eric-milles/assert-throws

Java 8: use `assertThrows` instead of `ExpectedException` rule