Some additional changes
Merge pull request #4 from FSlyne/branch2

Some additional changes