Updated version

Should fix travis as well as be more closely resemble the most current code