code needs cleaning up
Merge pull request #2 from core9/develop

code needs cleaning up