Merge pull request #40 from pepelsbey/master

Some missed elements added