Merge pull request #8 from ipri2013/master

Updating my fork
tryoffer fixed, minor changes
Merge pull request #56 from nejc92/master

tryoffer fixed, minor changes