Now in working condition!
Merge pull request #1 from unknownhybrid/master

Updates from master.