additional commits

16/5/2014