Subject: Patch-1

Description:
Merge pull request #1 from psachin/master

Subject: Patch-1