new code nov 27
Merge pull request #13 from nickmly/patch-13

new code nov 27