Fixed Issue #36

made it so you can chose between linear and non_linear