Updated to close #8