WIP: nizam_2in2 #53

Closed
orcun wants to merge 3 commits from <deleted>:nizam_2in2 into master