Close #23 (doesn't work with java7 yet it seems)