changes 05.03.2014.
Merge pull request #14 from ivica-skrinjar/master

changes 05.03.2014.