Merge pull request #2 from niksajanjic/0002

0002
changes