fixed bugggg
Merge branch 'master' of https://github.com/srkemper/smilendar
merge