Merge pull request #108 from pcbend/master

Merging branches