the 3rd try
Merge pull request #30 from mj1547/master

 the 3rd try