Merge pull request #1 from bkaradzic/master

normaly