closes issue#7
Merge pull request #26 from 121watts/issue#7

closes issue#7