Removed laoding timeout. Fixed #57
Resolved merge conflicts.