Bug fixed: #59 & #60