merged leecrossley:master