1.0.3 merge

Still alive