Merge pull request #6 from silkapp/master

Several small things