Added explicit checks to make sure that the amount = 1

Closes #3. Again.