Merge pull request #19 from jrri/master

Miscelaneus commits