Merge pull request #3from lmnn3/master