removed 158 close #19
Merge remote-tracking branch 'Finnian/master'