Updated to close #11