Feature/pullrequest 1

This should resolve issue #1