functions update
Merge branch 'coffee' of http://github.com/oldgeezr/sanntid into coffee
functions update