Merge pull request #3 from bdburru/development-082014

Development 082014