Supposed to fix issue 1

This branch fixes issue #1