This is my initial commit
Safety commit
Merge branch 'master' of https://github.com/shawnfc/sfc-dev