MtpA - Updated with Emre's changes
Merge branch 'master' of https://github.com/Team-Two/Documents.git