Merge pull request #36 from mikey179/master

integrate latest changes
make travis builds more reliable
add changelog, fix @since