Merge pull request #3 from lnanglin/master

merging master with dev
Merge pull request #4 from lnanglin/development

Merge pull request #3 from lnanglin/master