Merge pull request #1 from revence27/master

Unified code base.