Fixed wrapping issues--by cheating--temp fix
Merge pull request #14 from fredlawl/master

Fixed wrapping issues--by cheating--temp fix