20141109 - changes on DEV-01 branch