Correct prettygenerate bug
Correct travis test error
Merged 'develop'.
Correct tests to pass with new gem version (except date format)
Correct tests to pass with new gem version (except date format)
forgot to uncomment before commit