Logic updated according to specifiction
Merge branch 'master' of github.com:fantast1k/InformationSecurity