Fix #3 Add Scalive