Merge pull request #1 from informulate/dev

New updated code