rearrange solution
fix build script
Merge branch 'master' of https://github.com/eiriktsarpalis/UnionArgParser