added truth
main devleopment merged with master