Updated to 1.2

Made some updates based on @swistaczek's changes