Merge pull request #1 from lethaljd/working

Working
Merge pull request #2 from lethaljd/master

Merge pull request #1 from lethaljd/working