changes 18.03.2014.
Merge pull request #15 from ivica-skrinjar/master

changes 18.03.2014.