fixed properly
Merge pull request #2 from JeremyMarshall/master

fixed properly