Merge pull request #3 from bdburru/development-082014

Development 082014
Merge pull request #4 from bdburru/master

Merge pull request #3 from bdburru/development-082014