Merge branch 'master' of https://github.com/edeglau/storage.git
Merge remote-tracking branch 'edeglaugithub/master'