Added spec tests and travis config
Merged from remote