Added restart feature
#84