in eclipse
Merge pull request #1 from aljacks1/branch-1

in eclipse