Merge pull request #7 from ipri2013/master

Updating my fork
bugfix
Merge pull request #54 from nejc92/master

bugfix