QuickFix #22

Fixed problems regarding to merge commit.