Issue/3

This is a pull request to address #5.