Lots of stuff
Merge branch 'master' of github.com:/fasrc/fasrcsw