Issue # 1

Fixed the bugs