Merge pull request #24 from jlthomps/master

new build for more ordering fixes