Nimbus changes
Fixed some crap
Merge pull request #3 from MightyPork/NimbusTest

Nimbus test