Issue #255 Add to changelog
Issue #254 wait 1 second to fix timing issue in Travis
Merge branch 'master' into 1.x