Remove 4.4 compatability, code cleanup.
4.4 compatability.
Merge pull request #1 from fuzionnz/1.x

1.x
Merge pull request #4 from fuzionnz/master

Master