Fixed issue #17
Fixed issue #17 properly
Fixed issue #15
Merge branch 'master' of https://github.com/iolufemi/Supplies