Merge pull request #15 from lg-hslu/master

sync branches