Added 2 more functions
Fixes #1