This will fix #4 and close #4 at the same time.