Issue number 1 fixed
fixed issue 3
fixed issue 6
Merge pull request #23 from stephensm/master

bug 6