The program should run decently now, few bugs here and there.
Merge origin/master