step 5 changes
Merge pull request #5 from l0nley/step5

step 5 changes