Update 15/10/2013

Update my fork with the latest changes.