Merge pull request #17 from dezinezync/master

Fixes, Memory Management & Such
Merge branch 'master' into fork