Added callback
Resolved #1