Fixed #26
0.7.1