re-implemanted
stop warnings
bumped version