added possibility to disable animation [issue 62]