Solves #19, 24
Updated readme