Issue 14

This pull request closes #14 .