Changed to proper Java 7 resource management "try"
Added file tests. Looks good so far