Resolves #23

@jblock