minor updates
Merge pull request #12 from tbrisevac/master

Minor updates