pulled changes from upstream
fixed #1