fixed #4. Added options