Updated, fixes #31 /cc @yalisassoon