UPDATED: Eluna

Didn't commit the Linux compile fix. Here it is..

:D