Resolve issue #31

This is the first time I ever send a pull request so please correct me I'm doing this wrong.