Tommie Navin

merge of seanKeane branch and tommieNavin branch