Merge pull request #84 from aabes/pull-req-master-deaff9cb2b2db71d98aefc7a7a2ac10c20c07be6

passes unit tests on 1.8 as well.