20140203 update
Merge branch 'master' of https://github.com/StevenKW/lpthw