Merge pull request #3 from arm2pro/branch2

Branch2
Merge pull request #5 from arm2pro/branch1

Merge pull request #3 from arm2pro/branch2