merge
Merge branch 'master' of https://github.com/bletham/shared_coding
g function