solved #38, fixed #37
resolved conflict