------------- 1.5 Tue Jan 13 22:01:31 AEDT 2015 Improvements by Michiel Bejen <michiel.beijen@gmail.com>