Fixed Issue 30 by asmeurer.