mearge with develop
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 12 Nov 2014 10:23:25 +0000 (10:23 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 12 Nov 2014 10:23:25 +0000 (10:23 +0000)

Trivial merge