Merging @Burstaholic changes

Awesome changes!