Merge pull request #2 from jedesah/master

Various fixes