Merged branches
Merge branch 'master' of https://github.com/fmelado/Lapses.git