Possible fix for issue #2, still testing. Pushing to github to move code to my dev box.