Merge pull request #156 from Ishap/master

Garbage Collection
Whoopsy!
Merge branch 'master' of https://github.com/jamiedigweed/NSS-Phoenix