Please pull to resolve issues #4, #8