fixed #52 and #42
Merge branch 'master' of https://github.com/solutionsresourceinc/procurementtrackingsystem