This pull-request closes Issue #25.