apply changes and fixes from TPCombinators
additional update from TPCombinators
additional update from TPCombinators (2)
Merge pull request #1 from dsyme/master

apply changes and fixes from TPCombinators