Fixed issue # 6

:)