Merge pull request #12 from otherwhitefrank/fdye_2

Fdye 2
Pushing changes