Resolves #23

@jblock 
err, shouldnt have given it a shipit. This should be 23