Merge pull request #112 from linuxstb/master