minor updates
Merge pull request #19 from ariutta/master

minor updates