#19, #20, #21
Merge branch 'master' of https://github.com/cocagolau/Project_AirDropBox