Fixing first parameter name of NSDate generate method
Merge branch 'devel'