minor changes
Merge pull request #47 from nejc92/master

minor changes
Merge pull request #9 from ipri2013/master

minor.