Minor fixes. Added simple version.