Updated functions
Merge pull request #10 from Bloc/functions

Updated functions