Updates
Merge pull request #23 from sheniff/update

Updates