2014/12/02 elder-1
Merge branch 'master' of https://github.com/adaviddsc/elder