Merge pull request #12 from mraof/master

dsdfs
bugfixes
Merge pull request #27 from iconmaster5326/master

bugfixes