23-6-2013 Pull **UPDATED

See commits =)