Some updates
Merge pull request #1 from jexp/patch-1

Some updates