Old uncommitted changes
Merge pull request #2 from mway/dev

Old uncommitted changes