Merge pull request #14 from Ni9e/master

20130424_09:33