Merge pull request #2 from pisilinux/master