Fixed issue #17

Refactored the Yes/No Questions