#1290 Updated with lastest changes.