V0.1.9: Started to implement status switch and do some corrections