Refactoring; a little of this, a little of that
Oops, extra bits
Merge pull request #2 from Gio/dev

Branch merge