redoing
Merge pull request #31 from HexSoftware/mybranch

redoing