now working in 2013
Added in the tests to prove that it works.