Added generalized convex penalties
EOD