Version3, needs cleanup but no known bugs
Merge pull request #8 from emblaser/Joseph

Version3, needs cleanup but no known bugs