Merge pull request #1 from skunath/master

.