Version1, first complete working version
Merge pull request #2 from joecollins/version1

Version1, first complete working version