Sync all jrebirth changes
Merge pull request #48 from gpshenoy/master

Sync all jrebirth changes