Modified the mapper to include the quarters.
Merge branch 'arun'
Updating master