fixed bug 10
Merge pull request #21 from jtilton/master

fixed bug 10