resolves #1
merge conflicts
Merge pull request #3 from dxa4481/master

resolves #1