Fixing Issue #34. Added more options too