edit by dave
Merge pull request #1 from mrkdec2/master

edit by dave