Merge pull request #108 from pcbend/master

Merging branches
Merge pull request #109 from pcbend/devel

Merge pull request #108 from pcbend/master