Fixed issue #12, widget still needs some improvement