fix issue #23
Merge branch 'jovanbulck-master'