Merge pull request #23 from mikey179/master

integrate latest changes
upgrade
make travis build more reliable
add changelog