fix for issue #22
closes #21
closes #20
closes #19
closes #18
closes #18
closes #17
closes #15
closes #13
ready to merge
Merge pull request #25 from bammons/tckeelin_jscribne

tckeelin jscribne