Merge pull request #14 from glennlopez/master

sync
Merge pull request #15 from glennlopez/development

Merge pull request #14 from glennlopez/master