Merge with bruno's and oliver's changes. Add typing source code.