Merge pull request #68 from dewguzzler/master

Urgent
Merge pull request #69 from dewguzzler/master

still working on it