Merge branch 'master' of github.com:hpcsi/losf