Fixed a bug where an InputStream wasn't being closed when it was finished with.
Fix to save having to look up values that have already been looked up before.
Merge branch 'master' into devel

Conflicts:
	pom.xml