Revert main due to Issue-151, main is reported to be buggy, need to be fixed.

Revert main due to Issue-151, main is reported to be buggy, need to be fixed. #277