Yet more changes
Merge pull request #23 from sadasilva/master

Yet more changes