updates
Merge pull request #3 from fcolnaghi/master

updates