Merge pull request #66 from iceman1001/feature