Merge pull request #2 from lxc/master

merging upstream