Merge pull request #24 from codingjoe/patch-1

Major recoding