fixed bug 5
Merge pull request #14 from jtilton/master

Fixed bug 5