More Work Done.
Merge pull request #1 from Akull9/master

More Work Done.