added some functions
Merge branch 'functions-branch'