testing commit
Merge origin/master
Removed some unnecessary comments; changed long variables to int; some code optimizations