Merged changes from http://revisr.kittenz.tv on 06.25.2014