Merge pull request #26 from pmuellr/issue/25

Issue/25