Minor changes
Merge pull request #9 from nj3ma/dev

Minor changes