Merge pull request #2 from aammd/master

Get changes from upstream
Jenny almost finish Functions
Merge pull request #27 from jennybc/master

Jenny almost finish Functions