Added override to all overriden methods. Closes #187.