Pull request for issue 53

https://github.com/spulec/moto/issues/53