Merge pull request #6 from mikey179/master

integrate latest changes
make travis build more reliable
add changelog