Merge branch 'master' of https://github.com/7h3v01d/photal