This would solve #1 for the sake of travis-ci
Travis-ci build is working now