Changes to pg 120
Merge pull request #4 from bacoon23/master2

Changes to pg 120