Fixing bugs
Merge revision_2014-08-05