Merge pull request #58 from juree/master

Almost done. Bugs?...
Merge pull request #9 from ipri2013/master

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

bugfix
Merge pull request #3 from ipri2013/master

bugfixed