rename file
add checkpoint
Merge pull request #44 from vikramrajkumar/btsx

checkpoint
Merge remote-tracking branch 'remotes/origin/master' into emfrias_master
Fix automatic conversion in trinary operator for gcc