Merge pull request #73 from deskicio/patch-2 by danielsreichenbach