Add function annotations #16
Merge branch 't0016' close #16