Fixed linker error
Merge branch 'master' of github.com:jschmerge/xos