Merge pull request #191 from kron4eg/patch-1

Test on travis using Go1.4