PyCharm fixed some indenting
Added multiplier logic (with defaults as it is not that robust at the moment
Merged changes