Added history expansion

See issue #7 .