stuff
Merge pull request #2 from jpasko1/bugfix2

stuff