Finished API tagging, closes #27 (had to merge manually though :s)