Fixed staging bugs in develop branch.
bitstarter-hw4-p1