Merge pull request #3 from FSlyne/branch2

Some minor modifications to Branch 2
Merge pull request #4 from FSlyne/branch2

Some additional changes