Merge pull request #148 from jacquarg/master

Avoid empty list, fix #139.