Fixed #4 and resolved #6.