Merge branches 'master' and 'commandline' of https://github.com/juanantoniofm/greaper into commandline
Merge branch 'commandline' of https://github.com/juanantoniofm/greaper into commandline