issue #123

added blah blah
Merge pull request #2 from psey/test_branch1

issue #123