fixed code... still need to fix issue #5 and #6