Updated to 0.8.5-SNAPSHOT, updated license and headers