Skeleton for handlers
Merge branch 'master' of git