Merge pull request #14 from bendapkiewicz/release-candidate

put functions above add callback calls