Fixed issues after meeting in office
Merge branch 'master' of github.com:beckerTechnologies/ssc