minor changes
Merge pull request #15 from erderse/Branch-2

minor changes