working
fixed
resolving github issues