Resolves #6, adds jump list support