Merge pull request #9 from khempenius/master

(Incomplete) 'Pencil' icon added, but timeline needs to be reformatted