Merge pull request #2 from rexyti/master

A