Fixing Bugs
Merge branch 'master' of github.com:projectws/oscommercial
Merge branch 'master' of github.com:projectws/oscommercial
Merge branch 'master' of github.com:projectws/oscommercial