Merge pull request #12 from lg-hslu/master

sync branches
Merge pull request #13 from lg-hslu/gh-pages

sync branches