Merge pull request #56 from iceman1001/feature