Corrected merging bug.
Merge pull request #34 from plsm/master

Corrected merging bug. Merging.