api added, hell yeah
merge commit