Zealot push

Review Fix on #6 Zealot push
Merged