Updated, closes #6