Pull request 32

Testing #32