Atom 0.3 support & bugfixes