Merge pull request #9 from ipri2013/master

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

bugfix