Merge pull request #3 from lnanglin/master

merging master with dev