Working

Please pull working into master, it works!
------------------------------------------------------------