firstworking version.
Merge pull request #4 from BigTuna94/master

first working version.