Merge pull request #4 from hdabis/2nd-branch

Merge pull request #3 from hdabis/master
Merge pull request #5 from hdabis/master

Merge pull request #4 from hdabis/2nd-branch