Merge branch 'xingnx-master'. Closes #508
Merge branch 'master' of github.com:decause/hflossk