Tested and ready for merge. @aduggin