Fixes maidsafe/SureFile #12 and Fixes maidsafe/SureFile #16