- committing this in behalf of jahka, is kinda busy :)
- I'm going to commit some changes but this is the version found in the tracker, this way my changes will be easier to track