res2
Merge branch 'master' into Ricky
Merge branch 'master' into Ricky
added tests to get code coverage to 95%