Working Code

Improvements Pending
Merge pull request #68 from egmp777/master

Working Code