corrected merge problem
corrected merge problem

takashi310/fluorender,takashi310/fluorender,takashi310/fluorender,strawlab/fluorender,strawlab/fluorender,strawlab/fluorender,strawlab/fluorender,takashi310/fluorender