incorporate changes from cabosoft
upgrade project file
incorporate changes from chiunam
removed some unnecessary ;