fixes shir0tetsuo/Zero#3 and added new features