Pullling in changes from develop branch of jtriley